From: Dongxiao Xu Date: Mon, 6 Oct 2014 10:45:09 +0000 (+0200) Subject: xsm: add CMT related xsm policies X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4257 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=edc3103ef384277d05a2d4a1f3aebd555add8d11;p=xen.git xsm: add CMT related xsm policies Add xsm policies for CMT related hypercalls. Signed-off-by: Dongxiao Xu Signed-off-by: Chao Peng Acked-by: Daniel De Graaf Release-Acked-by: Konrad Rzeszutek Wilk --- diff --git a/tools/flask/policy/policy/modules/xen/xen.if b/tools/flask/policy/policy/modules/xen/xen.if index 32b51b60b7..641c797994 100644 --- a/tools/flask/policy/policy/modules/xen/xen.if +++ b/tools/flask/policy/policy/modules/xen/xen.if @@ -49,7 +49,7 @@ define(`create_domain_common', ` getdomaininfo hypercall setvcpucontext setextvcpucontext getscheduler getvcpuinfo getvcpuextstate getaddrsize getaffinity setaffinity }; - allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim set_max_evtchn set_vnumainfo get_vnumainfo }; + allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim set_max_evtchn set_vnumainfo get_vnumainfo psr_cmt_op }; allow $1 $2:security check_context; allow $1 $2:shadow enable; allow $1 $2:mmu { map_read map_write adjust memorymap physmap pinpage mmuext_op }; diff --git a/tools/flask/policy/policy/modules/xen/xen.te b/tools/flask/policy/policy/modules/xen/xen.te index 6cecf977c7..d214470397 100644 --- a/tools/flask/policy/policy/modules/xen/xen.te +++ b/tools/flask/policy/policy/modules/xen/xen.te @@ -66,6 +66,7 @@ allow dom0_t xen_t:xen { }; allow dom0_t xen_t:xen2 { resource_op + psr_cmt_op }; allow dom0_t xen_t:mmu memorymap; @@ -79,7 +80,7 @@ allow dom0_t dom0_t:domain { getpodtarget setpodtarget set_misc_info set_virq_handler }; allow dom0_t dom0_t:domain2 { - set_cpuid gettsc settsc setscheduler set_max_evtchn set_vnumainfo get_vnumainfo + set_cpuid gettsc settsc setscheduler set_max_evtchn set_vnumainfo get_vnumainfo psr_cmt_op }; allow dom0_t dom0_t:resource { add remove }; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 904aacf57d..6d0fe72859 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -724,6 +724,8 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_setvnumainfo: return current_has_perm(d, SECCLASS_DOMAIN, DOMAIN2__SET_VNUMAINFO); + case XEN_DOMCTL_psr_cmt_op: + return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__PSR_CMT_OP); default: printk("flask_domctl: Unknown op %d\n", cmd); @@ -780,6 +782,10 @@ static int flask_sysctl(int cmd) case XEN_SYSCTL_numainfo: return domain_has_xen(current->domain, XEN__PHYSINFO); + case XEN_SYSCTL_psr_cmt_op: + return avc_current_has_perm(SECINITSID_XEN, SECCLASS_XEN2, + XEN2__PSR_CMT_OP, NULL); + default: printk("flask_sysctl: Unknown op %d\n", cmd); return -EPERM; diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index daf0de599f..de0c707fdf 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -81,6 +81,8 @@ class xen2 { # XENPF_resource_op resource_op +# XEN_SYSCTL_psr_cmt_op + psr_cmt_op } # Classes domain and domain2 consist of operations that a domain performs on @@ -212,6 +214,8 @@ class domain2 set_vnumainfo # XENMEM_getvnumainfo get_vnumainfo +# XEN_DOMCTL_psr_cmt_op + psr_cmt_op } # Similar to class domain, but primarily contains domctls related to HVM domains